feat: Changes for multitenancy dashboard #963

prateek3255 · 2024-03-18T07:22:15Z

Summary of change

Adds an API to fetch the list of core config properties

Related issues

N/A

Test Plan

N/A

Documentation changes

N/A

Checklist for important updates

Remaining TODOs for this PR

Update the API to return all property values and more information about properties like if they can be updated across apps, are config YAML only or are protected because of SaaS

* Add an API to fetch the coreConfig properties * Update changelog * Include plugin configs as well * Remove core_config_result from the final output * Hide protected config * Fix formatting changes * Add tests to ensure that the properties are same in the config and core config file * Match descriptions from devConfig.yaml as well * Refactor CoreConfig to return ConfigFieldInfo objects * Refactor enum property validation * Refactor move storage fields to API * Refactor getConfigFieldsInfo method and update CoreConfigListAPI * Add test to check protected properties are not present when saas secret is set * Add comments wherever necessary

merge 9.0

rishabhpoddar · 2024-05-05T06:35:45Z

CHANGELOG.md

+## Unreleased
+
+- Add a new core API for fetching all the core properties
+


schema changes + migration of schema + changes to multi tenancy + changes to how you configure a tenant

Release prep at the end

src/main/java/io/supertokens/config/annotations/EnumProperty.java

src/main/java/io/supertokens/multitenancy/Multitenancy.java

rishabhpoddar · 2024-05-05T06:51:09Z

src/main/java/io/supertokens/webserver/api/multitenancy/BaseCreateOrUpdate.java

+        if (getVersionFromRequest(req).greaterThanOrEqualTo(SemVer.v5_1)) {
+            // if using first factors as a way to enable/disable recipes but the tenant was already created using an
+            // old CDI, we automatically enable the recipes to make things work seamlessly
+            if (hasFirstFactors && firstFactors != null) {
+                if (List.of(firstFactors).contains("emailpassword") && emailPasswordEnabled == null) {
+                    emailPasswordEnabled = true;
+                }
+                if (List.of(firstFactors).contains("thirdparty") && thirdPartyEnabled == null) {
+                    thirdPartyEnabled = true;
+                }
+                if ((List.of(firstFactors).contains("otp-email") || List.of(firstFactors).contains("otp-phone") || List.of(firstFactors).contains("link-email") || List.of(firstFactors).contains("link-phone")) && passwordlessEnabled == null) {
+                    passwordlessEnabled = true;
+                }
+            }


I think by default, all these enabled booleans have to be empty anyway for >= 5.1 CDI! Why is this being done?

You should just set all to true in this if block

do the if should be

(>= 5.1 cdi && emailPasswordEnabled == null) => emailPasswordEnabled = true

same thing for third party and passwordless

no that might bring in un-intended side effects if the tenant is being updated with something else, like coreConfig only. This is specifically to handle tenants created using older CDI, and now updating enabled recipes using the firstFactors array.

rishabhpoddar · 2024-05-05T06:55:45Z

src/main/java/io/supertokens/webserver/api/multitenancy/BaseCreateOrUpdate.java

            );
+            if (useFirstFactorsFromStaticIfEmpty == null) {
+                useFirstFactorsFromStaticIfEmpty = false;


we have to make this true for public tenant right? I think you need to refactor this whole thing to be more easy to read. Have separate branches in logic for if you are working with public tenant vs not, and what version of CDI it is. The code right now is very hard to follow and understand.

nope, it will be true if firstFactors is not passed at all. Whenever firstFactors is set, we set this boolean to false. Because this means that user want's to use that value for the tenant.

done refactoring

rishabhpoddar · 2024-05-05T07:01:36Z

src/main/java/io/supertokens/webserver/api/multitenancy/CreateOrUpdateTenantOrGetTenantAPI.java

+            if (getVersionFromRequest(req).lesserThan(SemVer.v5_1)) {
+                result.get("thirdParty").getAsJsonObject().remove("useThirdPartyProvidersFromStaticConfigIfEmpty");
+                result.remove("useFirstFactorsFromStaticConfigIfEmpty");
+            }
+
            if (getVersionFromRequest(req).lesserThan(SemVer.v5_0)) {
                result.remove("firstFactors");


you should make the toJson function only do this logic? Otherwise it is easy to miss doing this

rishabhpoddar · 2024-05-05T07:01:49Z

src/main/java/io/supertokens/webserver/api/multitenancy/ListConnectionUriDomainsAPI.java

+                        if (getVersionFromRequest(req).lesserThan(SemVer.v5_1)) {
+                            tenantConfigJson.remove("useFirstFactorsFromStaticConfigIfEmpty");
+                            tenantConfigJson.get("thirdParty").getAsJsonObject().remove("useThirdPartyProvidersFromStaticConfigIfEmpty");
+                        }
+
+                        if (getVersionFromRequest(req).lesserThan(SemVer.v5_0)) {
+                            tenantConfigJson.remove("firstFactors");
+                            tenantConfigJson.remove("requiredSecondaryFactors");
+                        }


you should make the toJson function only do this logic? Otherwise it is easy to miss doing this

rishabhpoddar · 2024-05-05T07:01:55Z

src/main/java/io/supertokens/webserver/api/multitenancy/ListTenantsAPI.java

+                if (getVersionFromRequest(req).lesserThan(SemVer.v5_1)) {
+                    tenantConfigJson.remove("useFirstFactorsFromStaticConfigIfEmpty");
+                    tenantConfigJson.get("thirdParty").getAsJsonObject().remove("useThirdPartyProvidersFromStaticConfigIfEmpty");
+                }
+
+                if (getVersionFromRequest(req).lesserThan(SemVer.v5_0)) {
+                    tenantConfigJson.remove("firstFactors");
+                    tenantConfigJson.remove("requiredSecondaryFactors");
+                }


you should make the toJson function only do this logic? Otherwise it is easy to miss doing this

rishabhpoddar · 2024-05-05T07:03:54Z

.../io/supertokens/webserver/api/multitenancy/thirdparty/CreateOrUpdateThirdPartyConfigAPI.java

@@ -112,9 +113,12 @@ protected void doPut(HttpServletRequest req, HttpServletResponse resp) throws IO
                    tenantConfig.emailPasswordConfig,
                    new ThirdPartyConfig(
                            tenantConfig.thirdPartyConfig.enabled,
+                            getVersionFromRequest(req).lesserThan(SemVer.v5_1) ?


why checking version here? The value of useThirdPartyProvidersFromStaticConfigIfEmpty should be already set correctly based on when it was created.

yes, but when add/update/delete thirdParty config, we should set it to false for CDI >= 5.1. otherwise, preserve the older state

rishabhpoddar · 2024-05-05T07:04:11Z

...ain/java/io/supertokens/webserver/api/multitenancy/thirdparty/RemoveThirdPartyConfigAPI.java

@@ -81,9 +82,13 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws I
                    config.tenantIdentifier,
                    config.emailPasswordConfig,
                    new ThirdPartyConfig(
-                            config.thirdPartyConfig.enabled, newProviders.toArray(new ThirdPartyConfig.Provider[0])),
+                            config.thirdPartyConfig.enabled,
+                            getVersionFromRequest(req).lesserThan(SemVer.v5_1) ?


why checking version here? The value of useThirdPartyProvidersFromStaticConfigIfEmpty should be already set correctly based on when it was created.

yes, but when add/update/delete thirdParty config, we should set it to false for CDI >= 5.1. otherwise, preserve the older state

prateek3255 added 3 commits February 28, 2024 13:48

Merge with base branch

0267bf2

Merge with 9.0

6dc4f22

prateek3255 changed the title ~~Feat/multitenancy dashboard~~ feat: Add API to fetch core config properties Mar 18, 2024

prateek3255 and others added 9 commits March 18, 2024 12:54

Merge branch '9.0' into feat/multitenancy-dashboard

f2b7192

Merge branch '9.0' into merge-latest

91d689b

Merge pull request #980 from supertokens/merge-latest

a54190c

merge 9.0

fix: core config list

34b26df

fix: serialize nulls

9c337b2

fix: is nullable

3f3394e

fix: plugin configs

f9e305a

Merge branch '9.0' into feat/multitenancy-dashboard

ed7360a

fix: add new booleans for core config

0eda7fe

sattvikc changed the title ~~feat: Add API to fetch core config properties~~ feat: Changes for multitenancy dashboard May 2, 2024

sattvikc added 8 commits May 2, 2024 17:09

fix: cleanup

f22f97d

fix: list apis

4a0c6e0

fix: refactor config description

503baa4

fix: refactor cud tests

6af95b0

fix: refactor tests

edbf1de

fix: tests

849a0f6

fix: type fix

ce9f173

fix: flag setting for thirdparty providers

8d85f7b

rishabhpoddar suggested changes May 5, 2024

View reviewed changes

sattvikc self-assigned this May 7, 2024

sattvikc added 6 commits May 7, 2024 14:11

fix: pr comments

046a244

fix: pr comments

7f2a091

fix: pr comments

0673de5

fix: pr comments

00999a0

fix: revert

5aacb67

fix: tenant tests

7306c7c

sattvikc added 14 commits May 13, 2024 13:29

fix: app tests

5c079fd

fix: cud tests

356160a

fix: other tests

6f45f91

fix: version and changelog

96cc96d

fix: inmemory

7c274e0

fix: skip deprecated

3bc49e3

fix: dashboard updates

dc30205

fix: minor fixes

bd3a8a1

fix: tests

3181e23

Merge branch '9.0' into feat/multitenancy-dashboard

b7a0ec8

fix: refactor

9ac9a13

fix: refactor

735bf7e

fix: changelog

25927ba

fix: refactor

42b42d1

sattvikc changed the base branch from 9.0 to 9.1 May 24, 2024 10:36

sattvikc marked this pull request as ready for review May 24, 2024 10:37

sattvikc merged commit 563a90a into 9.1 May 24, 2024
4 of 6 checks passed

sattvikc deleted the feat/multitenancy-dashboard branch May 24, 2024 10:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Changes for multitenancy dashboard #963

feat: Changes for multitenancy dashboard #963

prateek3255 commented Mar 18, 2024

rishabhpoddar May 5, 2024

sattvikc May 7, 2024

rishabhpoddar May 5, 2024

rishabhpoddar May 5, 2024

rishabhpoddar May 5, 2024

sattvikc May 7, 2024

rishabhpoddar May 5, 2024

sattvikc May 7, 2024

sattvikc May 7, 2024

rishabhpoddar May 5, 2024

sattvikc May 7, 2024

rishabhpoddar May 5, 2024

sattvikc May 7, 2024

rishabhpoddar May 5, 2024

sattvikc May 7, 2024

rishabhpoddar May 5, 2024

sattvikc May 7, 2024

rishabhpoddar May 5, 2024

sattvikc May 7, 2024

		## Unreleased

		- Add a new core API for fetching all the core properties

feat: Changes for multitenancy dashboard #963

feat: Changes for multitenancy dashboard #963

Conversation

prateek3255 commented Mar 18, 2024

Summary of change

Related issues

Test Plan

Documentation changes

Checklist for important updates

Remaining TODOs for this PR

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment